Merge tag 'upstream/1.7.1'
authorLeopold Palomo <leopold.palomo@upc.edu>
Thu, 3 Apr 2014 14:16:05 +0000 (16:16 +0200)
committerLeopold Palomo <leopold.palomo@upc.edu>
Thu, 3 Apr 2014 14:16:05 +0000 (16:16 +0200)
Upstream version 1.7.1


Trivial merge